Merge "Move stack to front in-sync with task reparenting" into oc-dev am: c4555784be
am: 7654775b8a

Change-Id: Icdfa610740ae34fe46e83dd3b604651392466ad9