Merge "Split out more privapp permissions"