fix constant name
simplify mutex locks in Player
fix moving crash
Merge branch 'master' into stub_screen