Merge "napdragonCamera:Modify Clear-sight match rules" into camera.lnx.1.0-dev.1.0