Merge "Merge "Fix bubbles being empty" into udc-dev am: 67c742427d am: 209acbbea9"