* commit '8955c54e0ea24a907c7ce06e7f2f3dd3afc84cda': Data quick settings - Usage shown should take into account merged IDs.