Merge "Don't make ripples respond to selection state" into lmp-dev