Merge "Fix for bug 8731235, flaky getting geolocation fix in tests"