Merge "Report correct display id in stack info" into oc-dev