Merge "Permission checks in the VDM demo preferences" into main