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

Change-Id: Ie75cdff935bc9df9fa9a1f4ac6634b5f6d2fe149