Merge "Fix RTL for SignalDrawable" into oc-dev