Merge "Merge "Add icon packs for themepicker." into qt-dev am: 2c09b3be23" into qt-dev-plus-aosp