base

Fix flickering issue

Bug: 25411780

Partial-revert for now, reopened b/22565656 to
deal with the memory use in a followup

Change-Id: I1ec636bc811a85eb2dc4f8c91562dc81b6261355