Merge "Fix fail to set vendor tag during HFR" into camera-SnapdragonCamera.lnx.2.0