[Fixed?] characters sometimes getting stuck in world

Change-Id: I1f0009765c03f835cff668347505998bc14e81e1
Merge "[Fixed?] characters sometimes getting stuck in world" into unstable