Merge "Fix jittery action bar during transitions" into nyc-dev