Merge "Ensure cleanup when interrupting scroll capture"