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

* commit '570a2363c8f80e94fbd6433e0c7f655a7350ad04':
  Ensure ripple mask is drawn at correct position