Merge "Increase battery app list maximum size to 20"