Merge "Fixing bugs with peeking a wallpaper." into nyc-dev
am: 4eeb7e2cae

* commit '4eeb7e2cae3d7cae43a35a6cc43b03ab923937bd':
  Fixing bugs with peeking a wallpaper.