Merge "Removing the divider in footerPreference as part of the material next changes."