Merge "Add a trunk stable flag for reordering wallpapers during a user switch" into main