Merge "PermissionController is now part of the core system."