Merge "Camera2: increase some timeout values" into lmp-dev