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

Change-Id: If00e45a0a130b4129d76bf1f7e3c121769d2e710