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

Change-Id: Ie3ecf5e74ed32eab7eebc7c1de4286692263f83e