Merge "Remove consumeNextDraw and replace with SurfaceSyncer" into tm-dev