Re-add back Slider shortcuts, cleanup lockscreen layout

Conflicts:
	AndroidManifest.xml