Merge "[Companion] Close chooser dialog on device tap"