Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev