Merge "Adjust to next focusable task if top task is died" into main