Merge "Settings search for app data usage" into main