Merge "Fix race condition for VQDS functionalities" into main