Merge "Camera: vary timeout by number of results expected" into lmp-dev