FP2-870: Merge upstream FairphoneLauncher3

- Comment duplicate resources on WallpaperPicker res to solve gradle issue

Change-Id: Ia288c1fa0d4eabac54e6fdfed17c4f28746e95b3
3 files changed