[automerger skipped] Merge "DO NOT MERGE Optimizing ScreenDecorations performance" into qt-qpr1-dev am: 5fe20902 -s ours am: f457cdd0 -s ours am: 4718d0f4 -s ours am: a5b78989 -s ours

am skip reason: Change-Id Ie33526214072ad324ca00a10074ad212dfbf4258 with SHA-1 9ae18fa2 is in history

Change-Id: Id47b681003cb7598c3a8c2b3ff5eb0fb79b35157