Merge "Revert^4 "Drop VDM permissions from Shell"" into main