Merge "Camera: Treat decreasing timestamp as BUFFER_ERROR"