[automerger skipped] Merge "DO NOT MERGE Optimizing ScreenDecorations performance" into qt-qpr1-dev am: 5fe2090213 -s ours

am skip reason: subject contains skip directive

Change-Id: Idf14e19d2762428505e11d109379bc3cd28ca345