Merge "SF: default display is active display"