Small cleanup of inactive permission dialogs.
Merge branch 'master' into shaketable