Merge "Only add user id to content uri if launching cross-profile target" into rvc-dev