Merge "Fix invisibility of status bar icons in call barring settings"
am: 77b813de9c

Change-Id: I18a2095c2734afabfd53e1906c061dfda3cd14ad