Merge "Fix focused error of embedded task fragments" into main