Merge "Fix crash from dismissing after pause" into nyc-mr1-dev