Update vendor settings with latest kconfig options.
Merge branch 'Release_2.0_Dev_Branch' into LabrinthAVBBranch
Merge remote-tracking branch 'origin/LabrinthAVBBranch' into Release_2.0_Dev_Branch