Merge "Remove Assert when NativeImageSource is reset" into devel/master