Merge "Fix invisibility of status bar icons in call barring settings"