Merge "SF: Remove DisplayModeSelectionParams"