Merge "Update VrListener location permission." into nyc-dev