Merge "Fix crash when clicking item in Battery screen" into oc-dev