Merge "Style fixes for GeolocationPermissions tests"