Merge "Apply local color extraction during drag-n-drop" into sc-dev