Merge "Companion device chooser UI enchancements"