Merge "Set display id on stack creation"