Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84

Change-Id: Ib54bda42c21dca85c8b58374d03c19f2f9c3ce15