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

Change-Id: I323df8edff134978e38ae100c96e6b580d6f1290