Revert "Clean up lock screen interface code"

This reverts commit ce2bd850708f801a3969779bfdcefac8b36ec565.