Merge "Move some battery stuff to SettingsLib"