Merge "resourceloader: Fix mw.loader to compute version for current request only"