Merge "hwc/overlay: Video on 4k2k external, 4k2k rotation."