[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: 6c798519 -s ours am: 5cea40d4 -s ours am: 0ba46d3a -s ours

am skip reason: subject contains skip directive

Change-Id: I850bad0ed1ff8c631cdd7a489be42c3bbc5cc122