Merge "SF: Fix a sporadic crash during multi-display boot"