Merge "fragment transitions" into jb-dev