ST|PM: video player pull request fail fixes