Merge "Fix issue #3414684: task_intra_wallpaper transitions have some inconsistency"