Merge "Replace consumeNextDraw with SurfaceSyncer" into tm-dev