Merge "Merge "Fix stack reference is not updated if the task is organized"...
Merge "Merge "Fix stack reference is not updated if the task is organized" into rvc-dev am: 35f762fb am: ff31b95b" into rvc-d1-dev-plus-aosp am: 377bc5ac
Change-Id: If33ffd564e52671809cd78ad90d6f11ea43cfe5b