Merge "Adding flag for Headless system user camera access in manifest file" into main