Merge "Allow shell to revoke notification permission without kill"