Merge "Snap to running task if it's offscreen when back is invoked" into tm-dev