Merge "Broaden the filter for wallpaper restore" into honeycomb-mr1