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

Change-Id: I398e98789bd7ebac32289a0a84ba9ab3393fb70e