Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev