Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev