Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84
am: 7a41660242
am: 4539d41abc
am: 90e7005350
Change-Id: I06fab561f8459f8651a4f3d05dadba7dd357d941
This commit is contained in: