Merge "SF: Remove DisplayDevice::DisplayType conditionals"