am 0cfca399: Merge "Don\'t cache resources across configuration changes" into ub-gmail-ur14-dev

* commit '0cfca3993c8f4bb13715a776880ba3faf2559776':
  Don't cache resources across configuration changes