Merge changes from topic "am-28343550-0e09-46a8-9e7c-4eb98071b838" into ub-launcher3-master

* changes:
  [automerger] Wallpaper picker fixes am: c382adc882
  Wallpaper picker fixes