Merge "Fix selected option not updated after applying color (2/2)" into main