Merge "Work around unintentionally translated String resource crashing SystemUI."