Merge "Clean up StartingWindowRecord from record manager once it is removed." into udc-qpr-dev