Merge "Fixing small regression in clear-all button and scrim alpha animation." into nyc-dev