Merge "Fix redundant set codec preference to native"