Merge "Fix stack reference is not updated if the task is organized" into...
Merge "Fix stack reference is not updated if the task is organized" into rvc-dev am: 35f762fb am: f72ccde6 am: a750866c am: 42ef14e1 am: 3845836d
Change-Id: Ie49e44ce508a3957414ec4adbe2a7ad62bdfbf56