Merge "RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed" into qt-qpr1-dev am: cf24ad44c4

Change-Id: I8cf1f07b47f0f5cbdd7f3bb54d47bc558353058a