Merge "Merge "Merge "Fix resumable session players" into tm-qpr-dev am: 9b204ac5 am: 46555d7f" into udc-dev am: 1125a000 am: c09e7344"