Merge "AwesomePlayer: correct stream type for offload" into klp-dev