Merge change 23568 into eclair

* changes:
  Work on issue #2079167: Flickering issue across multiple UI