Merge "Remove obsolete lock screen UI"