Merge "Avoid creating wallpaper rotation leash if it is not in transition" into main