Merge "Prevent a crash when maxLines is set to 0" into jb-dev