Merge "sdm: Fix virtual display & HDMI concurrency."