Merge "Stop user faster and clear stale broadcasts" into nyc-dev