Merge "Restore interface priority on R device" into sc-dev