Merge "sdm: Fix HDMI & virtual display concurrency." into dev-1.0