add NFC payment URL
Change-Id: I0583418dac5f02486682915ace84dbcaa7f8b69d

Conflicts:
	res/values/strings.xml
Fix the icon size in app lists.

E.g. the "Select app" dialog in the profile group configuration uses
this layout to inflate the list dialog. However app icons can have
non-standard sizes so we enforce a consistent width and height.

Change-Id: I71731a9bb3548c699cc2e0e600a5ff371ceacbc3
home ~> launcher

Change-Id: I753ff9bef5e91203e413bb88c6537b912f04517b