Merge "Camera2: Add buffer drop error callback" into nyc-dev