am d97eb873: (-s ours) DO NOT MERGE Revert "Prevent flickering. Fixes b/10994303."

* commit 'd97eb8738785fd5488417098c361633721dfdb19':
  DO NOT MERGE Revert "Prevent flickering. Fixes b/10994303."