Merge "Reorder loading wallpapers during a user switch." into main