Merge "Make hasOverlappingRendering() method more accurate" into jb-mr2-dev