Merge "Fix jump when dismissing last grid task View" into main