Merge "Clear snapshot buffer preemptively if unused" into tm-dev