Merge "hwc2: Do not reset current validate while honoring refresh request"