Merge "Fix call to restoreTrack_l() without lock held"