FEATURE: lock device UX improvements.