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

Change-Id: Iec1099bfd605c89ca7e6efc8aa1b6249db40d014