Merge "Fix flicker while booting" into nyc-mr1-dev