Merge "Update the VisibilityLoggerMixin and add a new enum"