Make notification-shade-collapse-after-dismiss behaviour configurable.

Change-Id: Icbf706a582279b86d901fb727b58663713606521

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBar.java