Merge "Change setDevicePropertyNative to no block."