Merge change I5ab9e0ed into eclair-mr2

* changes:
  1968334 [NJ-1432] Content truncated while seeking YouTube clip