Merge "Fix crash when opening battery page" into oc-dev