Merge "Camera: Check and update vendor tag descriptor cache"