Lockscreen shortcuts: fix indention
Parse UUID string with Long.parseLong

Integer.parseInt throws an NPE for values greater than 0x7fffffff.
Merge remote-tracking branch 'upstream/kk-ras-mr1.2' into lichti