Merge "Delay appop revocation when only capability is lost" into main