Lockscreen shortcuts: more unification

Use shared method to derive drawable inset and make the rounded corners for icon files also display when adding the target initially.
Merge remote-tracking branch 'upstream/jb-ras-mr2.0' into jb-ras-mr2.0