Merge "Do not call drawableChanged pre Q"