Merge "Add tracing for onTaskStackChanged" into oc-dev am: f217fc0eff
am: 400e29c8a9

Change-Id: I3b619d7c6983679fc6ddf9481b2b63a1326d801d