Fix custom carrier text bug with themes

Change-Id: I1a6a0617a33027c0fd8c3f596afd0108434b1660