Merge "resourceloader: Remove redundant 'window' indirection"