Merge "Fix issue #6636731: Mariner animation ring gets stuck" into jb-dev