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

Change-Id: Ie015140c3f468619520e702eaa6584fa3403f9d9