Merge "Make "Battery usage" accessible at any time" into oc-dev