Merge "QCamera: Add recover for single shot trailing buffer drop" into nyc-mr1-dev