Merge r10568 to fix single-pixel video