Merge "Don't allow a non-owner to grant access to APP key" into main