Merge "Fix crash in finish from onCreate." into nyc-dev