Merge "App Bubble custom icon support" into udc-dev