Merge "Fix NPE in LogicalDisplayMapper" into main