Merge "hwc: Revert reset pipebook format and retain 8992 specific change"