Merge "Update to consistently highlight selection for single field." into main