Merge "Fixing jank issue with animating alpha." into nyc-dev