Merge pull request #11045 from t895/color-edge-effect Android: Change color control highlight to system default
