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

* commit 'ed633e97e35fd8d04a1e0bec812db08b002b30b2':
  Fixing bugs with peeking a wallpaper.