Merge "Use getSyncTransaction in SurfaceAnimator and SurfaceFreezer" into tm-dev