Revert "DO NOT MERGE -- Revert the following two commits as they're causing flickering" am: f96cb3c3 am: 0caf507d Change-Id: Iaf539d5af86a0de2b1b6bade7817edd3bbe22e37