Merge "SnapdragonCamera: Fix setting video resolution for makeup" into camera.lnx.1.0-dev.1.0