Prepare migration
More cleanup
Merge branch 'feature/new-wallpaper-search-panel'