Bring back active display and fix systemui force close.
Thanks to cristianomatos.

Change-Id: I649abc7f236db8e0902fce2fd432ba1c09a1fff5
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
	core/res/res/values/bs_strings.xml
	packages/SystemUI/res/values/bs_styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	services/java/com/android/server/NotificationManagerService.java