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

Change-Id: I0e2c4d96df27e71d11b8a092f2cf86733d29727b