Merge "SF: default display is active display" into sc-v2-dev