Merge "Cache per-Activity Resources objects" into nyc-dev
am: 58f1018c56

* commit '58f1018c56a88e7864c7ff85f5b85129e790ffd2':
  Cache per-Activity Resources objects