Merge "Set the bidi flags on Paints in DonutView" into oc-mr1-dev