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

* commit '9856fbd40470c9f441b6c38b980210cfdef821e9':
  Broaden the filter for wallpaper restore