am ab1f2a82: am 9856fbd4: Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1

* commit 'ab1f2a824ba55ac7cabd2a342ab78a798408f44f':
  Broaden the filter for wallpaper restore