Merge "Fix flaky GNSS VTS" into main