Merge "Show removed user's data usage under its correct item"