Merge "Integrate LogicalDisplayMapper with DisplayFoldController."