Merge "Support data usage changes in Settings"