Merge "Removing disabled color extractor from Widgets" into main