Merge "Add SIM color picker" into qt-dev
am: b747c5c270

Change-Id: Ia234bd596017cf98dd5a76202c6fe7af486562f4