Merge "Add some more logging to settings battery stuff" into oc-dr1-dev