Merge "Hide wifi and bt in battery settings" into oc-dev