Merge "catch Time out waiting for surface exception" into camera-SnapdragonCamera.lnx.2.0