Merge "Clean up VisibilityLogging"