Merge changes Icb932343,I2ca96bd6

* changes:
  Avoid generating an outline that is not contained within view's bounds.
  Avoid performing the pathOp for clipped shadows if possible.