Merge "Mutate the drawable if a valid state change happen" into nyc-dev