am 06d12abf: Merge change I464c055a into eclair

Merge commit '06d12abf6368e7b2277e70332e945d6fcf5ee1c8' into eclair-mr2

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