Merge "Document special case in hasOverlappingRendering" into klp-dev