am 38e80fad: am 88d7cbb0: am e7261692: am d750f8b3: Merge "Clear the promise flag once the restore animation is run and no more restore related tasks are pending" into ub-now-porkchop

* commit '38e80fadc5f8dc1bc9d595e9820e69c39a981c4a':