Merge "resourceloader: Remove obsolete '$that = $this' closure pattern"