Merge "Fix a bug in ControllerActivityCounter" into nyc-dev