Merge "SnapdragonCamera: refactor clearsight code and add persist flags" into camera.lnx.1.0-dev.1.0