Lockscreen targets: fix NPE when cancelling the shortcut picker
Lockscreen targets: fix icon assignment problems
Merge branch 'jb-ras-mr2.0' of https://github.com/rascarlo/android_packages_apps_settings into jb-43