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