Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev

* changes:
  [Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect
  [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button