Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev