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

* commit '0c255a946788499d7f169429890d5a423426593b':
  Changed behaviour of the wallpaper picker.