number of notification icons in tab ui

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java