More updates to support SalesforceSDKManager switch