Bring Colorpicker up to date with SlimRoms

Change-Id: I4e00188d9295008116a1c373f9393e53a869bb9c