Merge changes from topic "perm-flags"

* changes:
  Do not revoke pre-M perms on upgrade
  Also apply removed permission flags