Merge "Add a proxy activity for launch bubble for another user in primary user" into udc-dev