am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '466786b25b262f4f6e5737b3a88e8d7f6916e45c':
  LiveSession: fix incorrect stream key (subtitle"s")
  M3UParser: trim spaces when parsing comma separated codecs.