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