Merge "Optimize DataUsagePreferenceController" into main