Merge "SF: HWComposer::isConnected can be called before a display is connected" into sc-dev