Merge "hwc: Use correct z-order in video overlay"