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

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