Merge "Fix scrim opacity in the brightness mirror" into oc-dr1-dev