Merge "Improve action bar transition" into nyc-dev