Merge "DO NOT MERGE Revert all scrim related changes in qpr" into qt-qpr1-dev