Revert "Merge remote-tracking branch 'remotes/upstream/MP1-4210-FEAT-Live_commercial_skip_detection' into 1.7.0Fork-BDJ"

This reverts commit 30acbd814add9d538e6873f9e965bc06662953f1, reversing
changes made to 3fa4f91117e045a1c7d278ef875b61a054c6a161.