Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev