am dd4a1e38: am 7d234fab: Merge "Don\'t drop the drawable cache completely on configuration change"

* commit 'dd4a1e3825f4f379ba36fd721f78de0101bb1833':
  Don't drop the drawable cache completely on configuration change