am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev

* commit '54c807e713c0d04134108b7d13e4abd467e318d5':
  Translate ripple mask to account for drawable bounds