Merge \"Fix jittery action bar during transitions\" into nyc-dev
am: 8507d98ad1

Change-Id: I1a445bc9ce438432643f94ec912b7838b55849dd