With join taking much longer, sometimes device can be lost from supplicant. Retain device to complete connection. Also, clear up stale peer data after find stops during inactive state. Bug: 6557725 Change-Id: I15b92e50a837481f974034b1ea7b32c8abee969e