fixup! [M120 Migration][HBBTV] Merge track and subtitle related patches