Merge "Add SIM color picker" into qt-dev