Merge "Enable Runtime logging in DisplayManager" into main