Merge "Use per-user Shell UID for adoptShellPermissionIdentity()." into rvc-qpr-dev