Merge "display: config: Add mapper packages"