Merge "Move nulling of nextFrameCallback" into pi-dev
am: e4e9ee7951

Change-Id: If988240d948266118a9441ee356ff384b4ff53b5