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

* commit '3283e02a45431d92689e92ba683a05b4fc457541':
  Cache per-Activity Resources objects