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

Change-Id: I45f7f696e439daf826e717cc1c722237a3eec0c5