Merge "Fix flicker for AppDataUsagePreference" into tm-dev