Fix drawable being displayed empty when re-entering the target edit dialog.
Lockscreen shortcuts: fix NPE
Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-ras-mr2.0