Merge "Fix flicker while booting" into nyc-mr1-dev am: 02405fb349 am: 1236822121
am: e0097c8413

Change-Id: I9721d1c38b6e8f9b845c67b16348c9d524a54e3d