am e436e187: Merge "RS: Water Livewallpaper crashed after setting it to wallpaper several times."

* commit 'e436e18739369bfc1c4a1e9cdd42c257aabe5031':
  RS: Water Livewallpaper crashed after setting it to wallpaper several times.