Merge "Add config to disallow the battery % option" into pi-dev