Merge "Synchronize ZenModeControllerImpl callbacks"