Revert "DO NOT MERGE -- Revert the following two commits as they're causing flickering"
am: f96cb3c34d

Change-Id: I1756346f1713f758374f2b8476c70a60119986dd