Merge "Clear the promise flag once the restore animation is run and no more restore related tasks are pending" into ub-now-porkchop