Merge "Add an extra pixel to the ripple radius used for bounds" into lmp-dev