Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev