Merge changes I3ee2313c,Ibbf9eb2a

* changes:
  Remove divider line for battery card preference
  Add CardPreference in battery settings page