Merge "Add a new bubble at limit while expanded" into main