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

am skip reason: subject contains skip directive

Change-Id: Iae47e9c85602ed9e93e195d53cd9ee57e19d9458