Merge "Camera2: Correct error handling" into lmp-dev