Merge "Fix issue with re-order animation not hinting the correct direction" into jb-dev