Merge "Update the handling of the native bridge property."