[automerger skipped] Merge "DO NOT MERGE Optimizing ScreenDecorations...

[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: a18bfa3d -s ours am: 39baf89b -s ours

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

Change-Id: I5dd4c58ce065484f04e81e119444a2a7ca1da97b