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

Change-Id: I0168ea749ae01b4ee254655b9b113c0a42ff3f79