Merge "Remove NPatchLoader observer when they request remove" into devel/master