Merge "Don't let two closing animations run at the same time" into lmp-dev