Merge "Move nulling of nextFrameCallback" into pi-dev