Merge "Show selected color in customization option thumbnail" into main