am 4c4aacaf: am 951ec583: Merge "Fix issue where reorder animations could leave views in translated state" into jb-dev

* commit '4c4aacafd15c59ce92786144a892fd90c8897b70':
  Fix issue where reorder animations could leave views in translated state