Merge "Add aconfig flag for wallpaper restorer" into main