Merge "ColorPicker Focus changes" into tizen_2.2