[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: f8086170 -s ours

am skip reason: subject contains skip directive

Change-Id: I119dad7e4413e25676861b47848a974f9ca7de5c