Remove launcher hack

This was an option to restart launcher due to wrong calculations on launcher (hotseat bug)
Remove settings provider entry
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_frameworks_base into jellybean

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: Iad8d6b3450bf24d0f2e10cfcc0356fc87a460f6b