Merge "SnapdragonCamera: Add a persist setting to remvoe 4K limitation" into camera.lnx.1.0-dev.1.0