Merge "Add multi-users support to app bubbles" into udc-dev