Merge "SF: Fix mode setting for secondary displays" into main