Merge "Refactor DisplayManagerService" into main