Merge "DO NOT MERGE Optimizing ScreenDecorations performance" into qt-qpr1-dev