Merge "Fix potential NPE when removing bubble" into udc-dev