Merge "Wait for location settings change in test"