Merge "Merge "DO NOT MERGE Do not call drawableChanged pre Q" into qt-dev am: d007c7b9 am: cbacbea8" into qt-r1-dev-plus-aosp