Merge "Fix asset loading on ResourcesImpl swap"