Merge "Fix bubble bar bounce animation issue" into main