Merge "fix a bug that caused the off animation to not show sometimes"