Merge "Obtain cached drawables using the correct Resources object"