Merge "DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue""" into pi-dev
am: 44505ef8cd

Change-Id: I39adc9974b57830940b983bc7d378359de0505fd