Merge "Simplify DisplayManager flag library" into main