Merge "Fix overrides of isLayoutRtl(Drawable dr)"