Merge "Translate ripple mask to account for drawable bounds" into mnc-dev