App Circle sidebar revert add support samsung multiwindow flags

Change-Id: I792bbc99d235d27c5f8a7f7f660a1e95c1c0b3d1
Option to always show heads up in expanded mode [1/2]

Change-Id: If8de4d34b4af89741a676bfb6400132f23826424

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java