Merge "Fix location settings bug on non-GPS devices" into pi-dev