Merge "Integrate some VCP APIs into SettingsLib" into main