Merge "Switch ScrimView to use view alpha" into udc-qpr-dev