Merge "VDM and camera framework changes for camera device awareness" into main