[DF-480] Added one click edit for property items. Fixed wrong color issue with color picker was canceled