Merge "Fix issue #10650718: Camera DOA on KLP" into klp-dev