Merge "Partial Revert "Update the following fonts NotoNaskhArabic NotoNaskhArab...""