Merge "Update ZenModeInteractor.activeModes to include all relevant data" into main