Merge "Fix drawable-state cache expired issue" into main