Merge "Remove ActivityRecords for sandbox activities when App/sandbox died" into udc-dev