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

Change-Id: Ibb907f480b0c11839a2fc33ec95ff77b8a54b244