Merge "HLS: preserve old format in onChangeConfiguration2" into mnc-dev