Merge "Fix exit transition and dismiss callback for popup exit transition" into nyc-dev