Merge "Handle Gnss Hal service death gracefully" into pi-dev