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

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