Merge "Allow pinned activities to finish immediately" into nyc-dev