Merge "Act on scrim visibility" into sc-v2-dev