Merge "Add SurfaceSyncer class" into tm-dev