Handle nested xtrace states

Change-Id: Ibdfc8d7d1e1457a9bc889b781ce176b417789ea1
Merge branch 'identity-v3' into dt-test
Merge branch 'stack-user' into dt-test