Merge "Fix ViewDebug tests" into jb-dev