resolve merge conflicts of d5d7fa10af to ub-launcher3-master.

Change-Id: I324b1a9cd3c6dce1d5d3b14d3ef95f798e5bc243
tree: 14671b393f662d395c2e2a3b3f3fdd6dd6741856
  1. WallpaperPicker/