Merge "Add tracing for onTaskStackChanged" into oc-dev