Merge "hwc: Remove non-wormhole usage from FB config for split display"