Notification shortcuts spacing and tablet transition fix

Change-Id: Ifcf888673b6ab80b43d427cf2a03b0beb7f56689

Conflicts:
	packages/SystemUI/res/values/dimens.xml

Conflicts:

	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java