Merge "No longer traverse files to get folder size." into arc-apps