Merge "SF: return the active display from getInternalDisplayId"