Merge "Add logging for zen mode events." into udc-dev