Merge "hwc: Fix HWC Writeback one less frame dump"