Merge almost all changes from...

Merge almost all changes from 2206-assert-in-stereo_switching_enc_fx-for-omasa-rate-switching-input-new-stv_revVE