Merge "Update DecorContext's Resource cache when calling getResources." into pi-dev