Merge "Revert "Add XML configuration for density""