Merge "Don't drop the drawable cache completely on configuration change"