Themes: Fix wallpaper chooser crash

Fix AOSPA-477
Merge "Themes: Fix wallpaper chooser crash" into kitkat