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

Change-Id: I56e1ee20782793357dfab3eb7b1280b36829b968