Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev