Merge "Add missing nothingToDraw() check"