Merge "Make sure ripple background bounds are used for invalidation" into lmp-dev