Merge "Revert "Fix use-after-free in GnssMesaurementInterface"" into tm-dev