Merge "PEEK [1/2]" into kitkat
Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationPeek.java
	packages/SystemUI/src/com/android/systemui/statusbar/notification/SensorActivityHandler.java