Merge "Fix bubbles taskbar scrim showing when notification panel is shown" into main