Merge "Move stack to front in-sync with task reparenting" into oc-dev