Merge "Fix Snapshot->Live transition"