Merge "Handle non-started LayoutTransition animations correctly" into jb-dev