CDB-1838 #resolve color picker interaction changed
Merge CDB-1816 into release/2.11.0