Merge "Mirror TaskSnapshotSurface to WMShell(2/N)"