Merge "Waiting for snapshot layer gone for quick switch tests." into tm-dev