Merge "Fix data disabled icon from not showing in status bar"