Merge "actually cancel sounds when we get a quiet update" into nyc-dev