Merge "sdm: Handle pending external display connection"