Merge "Fix data disabled icons in RTL" into nyc-mr1-dev