Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev