Merge "Remove the main thread blocking call to get SSID" into sc-dev