Merge "Revert "Fix flicker while booting"" into nyc-mr1-dev am: 94b976a8c2
am: edb092c6f7

Change-Id: I1af403e9b652e1124e23087bd465e2c7a6c54b0a