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

Change-Id: I3865e04e690ce477a4294aca1ec5d8cfb16b8b40