Merge "More view hierarchy, fragment debugging." into jb-mr1-dev