Merge "RESTRICT AUTOMERGE Rename PermissionController resource constants" into tm-dev