Merge "Fix case in which onTaskStackChanged was not called"