Merge "Fix issue with alphas not being applied to the same view on unlock" into sc-v2-dev