Merge "Preserve bubble bar state." into main