Merge "Fix behavior of inflating InsetDrawable" into lmp-dev