Merge "Move mPermissionTrees to permission settings"