Merge "SF: return the active display from getInternalDisplayId" into sc-v2-dev