Merge "DO NOT MERGE Synchronize ZenModeControllerImpl callbacks"