Merge "Grey the previously connected device preference" into pi-dev
am: d24c9e4a80

Change-Id: Ib21ad60483a97563c075f12d49b0179db44e661b