Merge "Fix status bar background flicker" into nyc-dev