Lockscreen targets 1

Change-Id: I6030cd04ad5a49be688b830fbb592ee4b08b8bde

Conflicts:

	AndroidManifest.xml
	res/drawable-mdpi/ic_empty.png
	res/layout/pick_item.xml
	res/values/arrays.xml
	res/xml/display_settings.xml