Revert "Fix flicker while booting" am: ba5339d5d6 am: 6a032cca07
am: 2cfc4f61f9

Change-Id: I2e948345e57725dab6d64d6dabf3f5c08056207d