Merge "Change Connectivity resources SDK version to 30" into sc-dev