Merge "Don't disable back button when device name is empty"