Merge "Dump controller for AppWindowToken" into oc-dev