Merge "Bring back transparency for QS" into oc-dr1-dev am: d037c6ac36
am: a31688b8cb

Change-Id: I0dd0cd775568bbcbf4f09a2528c707b992eed735