Merge "Revert "hwc2: Treat pluggable displays as source of vsync""