Revert "DO NOT MERGE -- Revert the following two commits as they're causing flickering" am: f96cb3c34d am: 0caf507dbe
am: e92230a990  -s ours

Change-Id: Ia740d939c385a7cc026a6e15c2ab54a0535647b9