Merge "Round the slashes of SlashDrawable" into oc-dr1-dev