Lockscreen shortcuts

Conflicts:
	res/values/ras_strings.xml
	res/xml/system_settings.xml

Change-Id: Ib299b6f3c2ae545af65ae044fccf2ad5bed697f6
Quick launch

Conflicts:
	res/values/ras_strings.xml

Change-Id: I4c41e9fb114a9c1afbbe9f7b36f4d8a15ef076e3