Merge "Revert "Fix an issue where animated the bubble bar twice from bubble button"" into main