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

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