Merge "Update the global focus state on onTaskInfoChanged without flag" into main