Merge "Isolate Ravenwood sysprops from device sysprops" into main