Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev