fix blackout animation, prevent movement if blacked out
merging upstream