Merge "DM: Add owners for DisplayControl" into main