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