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
Change-Id: Ibff23dac543c6cb4c5820bab382c3931cb01f3f7