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

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