am 67d90e9d: am 06d12abf: Merge change I464c055a into eclair

Merge commit '67d90e9d46aa9f26472861e48c69c8e8a28ece21' into eclair-mr2-plus-aosp

* commit '67d90e9d46aa9f26472861e48c69c8e8a28ece21':
  Bug 2244530 - Disable the attempt at not flickering.  It's interfering with the frame rate while rollo animates in.