Merge "Fix expanded bubble view below scrim" into main