Merge "Add carrier config for hiding TTY HCO and VCO" into qt-r1-dev