Merge "add sdk_version for settingsLib flag" into main