Revert "Revert "Themes: Fix wallpaper chooser crash""

This reverts commit f9469fe18b5251b778c74c23d52a51428252cc38.
Merge branch 'kitkat' of https://github.com/AOSPA/android_frameworks_base into kitkat