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: 1144b240 am: 21afc513
Change-Id: I8e8c4dcb3faaf4954c9d5a5f5bba0d0439812cf7