Merge "Properly cancel pending buffers on window size change"