Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev