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

* commit '17b9cec1b6fedd0e54ff61f5a12f0e515add70ab':
  Fix issue #6636731: Mariner animation ring gets stuck