Lockscreen targets: fix NPE when cancelling the shortcut picker
Lockscreen targets: fix icon assignment problems