Merge "Hide misc in battery settings" into oc-dr1-dev