Merge "Make SnapshotStartingWindow and its child surface trusted"