Merge "Make display manager logging conditional" into main