Merge "Add adaptive charging to the top level settings menu"