Merge "Add WIFI_SCANNING_SETTINGS action to Settings" into sc-qpr1-dev