Merge "Revert back to DroidSansArabic font for SystemUI"