Merge "Handle empty default lists in confg.xml"