Merge "Update FLAG_BUBBLE in BubblesManager#onUserChangedBubble" into tm-dev