[TRACKING ISSUE] Bring player to feature parity with official web player