Merge "hwc2: Improve multi-display creation and hotplugging"