Merge "Set advanced battery usage items as non-selectable" into oc-dev