Merge change 5625 into donut

* changes:
  fix [1947273] the DimLayer causes the whole screen to update during transactions