Merge "Remove unnecessary dropShellPermissionIdentity" into main