am 86a4c286: am 309c5a81: Clean up label for live wallpapers.

Merge commit '86a4c2862d4147326982ed71d3e8a288ed837db6'

* commit '86a4c2862d4147326982ed71d3e8a288ed837db6':
  Clean up label for live wallpapers.