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

* commit 'bae051f6bd8ae4f103d8067ed96accbced173664':
  Use consistent logic for data icon overlays.