Merge "Fix MediaPlayer raw pointer usage" into main