Merge "Restrict more properties to device-supported packages." into main