Merge "hwc2: Fix pluggable displays creation during boot"