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

* commit 'e2a49bfc50f27dd489e779ebde68c561104e1241':
  Fixing jank issue with animating alpha.

Change-Id: I668496c9e1177093ac971fd9d4cbd24e85c4b383