Merge "SystemUI: Allow theming battery via theme chooser" into cm-11.0