Merge "Fix gray out previously connected device preference issue" into pi-dev