Merge "Show wifi and bluetooth item in battery settings" into oc-dev