Merge "Don't animate new bubble when already expanded" into main