Merge "Remove feature flag for battery settings" into pi-dev