Merge "Starting sandbox activity should not start a new sandbox process" into udc-dev