Merge "Fix an issue where bubble bar would collapse when rotating" into main