Lockscreen targets: fix NPE when cancelling the shortcut picker
Lockscreen targets: fix icon assignment problems
Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-mr2.2-test