Merge "configs: update missing configs affected from QCV changes"