Merge "Fix issue where we'd start GONE -> LS instead of AOD -> LS." into main