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

* commit '238e6caa923c07a23075d2cd4c4dbf32ab24faca':
  Don't cache resources across configuration changes