Merge "Allow config to disable battery percent setting" into pi-dev