Merge "SnapdragonCamera: adjust video recording duration margins" into camera.lnx.1.0-dev.1.0