Update drawables to remove old contained state
A few drawable changes