Merge "Do not reuse non-leaf tasks for the starting activity" into rvc-dev am: 717dfad69c

Change-Id: Icb4ff872a7ffd3d07f292fbe17bc5e502950f3fb