Merge "Move old battery settings page to dev options"