Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev