Merge "Show device chooser dialog if set of devices has changed." into idea133