Merge "Improve the Device menu"