Merge "Bring back transparency for QS" into oc-dr1-dev