Revert "Fix flicker while booting"
am: ba5339d5d6

Change-Id: I1c3dfbe95e35db94d36d98507474690b0e70d4b2