Merge "Allow auto companion apps to manage global Zen state" into main