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

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