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