Merge "Replace VRI and SV sync logic with SurfaceSyncer" into tm-dev