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

Change-Id: Id16468100e542c9e889af0c9ccdf9c2430532a21