Merge "DashPlayer: make jb_mr2 compatible"