Merge "Fix flicker of "App data usage"" into 24D1-dev