am 99e33bf1: am 17b9cec1: Merge "Fix issue #6636731: Mariner animation ring gets stuck" into jb-dev

* commit '99e33bf14b2be799efe02b9a8a42b25abc0fced3':
  Fix issue #6636731: Mariner animation ring gets stuck