DO NOT MERGE Revert "Prevent flickering. Fixes b/10994303."

This reverts commit bb6f0504c1607c89d9a3dd3e6023f36d61837016.

Change-Id: I834c3f2a2ebf89108d67ef497bfd52b1234e55cd
7 files changed