Merge branch dev/FP2N-265 into int/n/fp2

* dev/FP2N-265:
  Wifi stops periodic rescans and disconnects

Change-Id: I10c359a9beab16aad77a9f143a5ecbe384790c79