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

Change-Id: I5a7f471d014ef515d6448d6fe3cb2bbad8799b85