Lockscreen shortcuts: more unification
Port of: d1b09375565c70372dd4d974f6b156b23bcdb94c
Signed-off-by: PipelinerArd <kristoferard@gmail.com>