Merge "SnapdragonCamera:Camera reinit with wrong id" into camera.lnx.1.0-dev.1.0