Merge "Cache per-Activity Resources objects" into nyc-dev