Merge "Revert "Clean up LogicalDisplayMapper"" into sc-dev