Merge "Add adoptShellPermissionIdentity to setup" into main