am 6db4303d: Merge change 23568 into eclair

Merge commit '6db4303d04d138cd2648b829306c4b1693ac12e8' into eclair-plus-aosp

* commit '6db4303d04d138cd2648b829306c4b1693ac12e8':
  Work on issue #2079167: Flickering issue across multiple UI