Merge "Handle new bubble notification during animation" into main