Merge "Move the drawable state to the correct class. Bug #4170455"