Merge "Blame only location observers that actually receive updates" into nyc-dev