Merge "Convert Privacy Types to use PermissionGroup icons" into qt-dev