Merge "configs: enable codec switches at the end"