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

Change-Id: I9fe03bc7409f2631aa8b7a5d1d2a8542d4a1fd3c