Merge "SF: Fix display mode transitions for multi-display"