Merge "Don't show the "permissions error" page after a user self-removes rights"