am 11104791: Merge "Ensure ripple mask is drawn at correct position" into mnc-dev

* commit '11104791c71e0140f1d37b711ca929939a85b77c':
  Ensure ripple mask is drawn at correct position