Merge "Fix gray out previously connected device preference issue" into pi-dev
am: 2ffa711cd1

Change-Id: Id889619b77d10826ad0c0eefe494b7aea3a4d779