Merge "Tidy DisplayManager dumpsys" into main