Merge "Fix SF hint sessions for virtual multi-display case"