AUI-1091 - Update the selected value on choosing custom color
AUI-1091 Source formatting
Merge branch 'pr-362'