Merge "DO NOT MERGE Do not call drawableChanged pre Q am: 843f9dee8b am: 605e74c930" into qt-r1-dev-plus-aosp