Merge "Camera2: Increase capture timeout." into jb-mr1-dev