Merge "Clean up LogicalDisplayMapper" into sc-dev