Merge "Return valid task id of bottom activity for isTaskRoot" into main