Fixes #3721 - Map OS family to a display variant