Merge "Make bubble scrim be dark always" into sc-dev