Merge "Don't trigger log for empty views" into jb-mr1-dev