Merge "Use Builder to replace the Uitls.addFooterPreference"