Clean up a few things that didn't work to fix missing lock screen
controls.