Merge "Add navigation for set wallpaper dialog" into main