Merge "Preemptively clear buffer reference if snapshot is unused" into qt-dev