Rambar colorpicker updates

Change-Id: I0eb21f2230693d51cedd28f435adf2452a96d95c