Merge "Update quick switch test to support animations without SnapshotStartingWindow" into tm-dev