LPS-51383 Keep using validator, since selectedLayout can be an empty string
LPS-51383 Apply to fieldRawValue for consistency