Merge "Update lost mode location logic" into tm-dev