Merge "Camera: drop stale callback buffer" into klp-dev