Merge "fix last frame buffer copy logic regression"