am 10acea59: am 0c255a94: Merge "Changed behaviour of the wallpaper picker." into ub-now-lunchbox

* commit '10acea596e3752d1eab693fd34209767e991c92d':
  Changed behaviour of the wallpaper picker.