Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev