Merge "Fixed an issue where we would access the wrong drawable"