Merge "Nested fragments." into jb-mr1-dev