Merge "Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3a...
Merge "Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3a am: fa050d63" into nyc-mr1-dev-plus-aosp
am: 5686771d
* commit '5686771d':
Fix status bar background flicker
Change-Id: I87a4eacafcc9c7178d95844c8b7e5675bc1d5ecb