Merge "Fix Flakey View Tests" into jb-dev