Revert "Lockscreen shortcuts: more unification"

This reverts commit 33f655772fb20871748b09d0af57cdaa319c635d.