Merge "sdm: Fix HDMI Primary and Virtual Display concurrency use case"