Merge "DO NOT MERGE Do not call drawableChanged pre Q" into qt-dev
am: d007c7b90d

Change-Id: I19dc7196f9b7dfeff5e2f18e4ecaedc5c480db3b