Merge "Catch NotFoundException in getDrawableForDensity" into main