Merge "Update the layout of AppDataUsagePreference" into main