Merge "Turn on new battery settings page"