Merge "Add default value for battery app list flag"