Merge changes from topic "remove_consume_next_draw"
* changes:
[automerge] Remove consumeNextDraw and replace with SurfaceSyncer 2p: a2e1f448 2p: 6f470246
[automerge] Remove consumeNextDraw and replace with SurfaceSyncer 2p: a2e1f448
Remove consumeNextDraw and replace with SurfaceSyncer