am 08ca890a: am 6db4303d: Merge change 23568 into eclair

Merge commit '08ca890ab226be71bbae2805c3dc44b469a39747'

* commit '08ca890ab226be71bbae2805c3dc44b469a39747':
  Work on issue #2079167: Flickering issue across multiple UI