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