Merge "Update bubbles to use icon factory in the lib" into udc-dev