Merge "Fix issue where reorder animations could leave views in translated state" into jb-dev