fix settings crash
Merge remote-tracking branch 'aosp/jb42' into jellybean