Merge "Clear permissions for virtual devices" into main