Merge \\"Improve action bar transition\\" into nyc-dev am: 207cbee824
am: a2b932892c

Change-Id: Id0561a90e8f855a819d5bf759c192f50e8c114ad