Merge "Reset virtual device permissions" into main