Merge "Make battery status refresh in SettingsActivity" into oc-dev