Fix crash in Settings - Storage (part 1)
Fix Settings - Storage (part 2)
Merge branch 'jellybean' of github.com:1ceb0x/android_packages_apps_Settings into jellybean