Merge "Keep a baseline heap before a test." into tm-qpr-dev