Merge "Fix disappearing ripple background, treat active ripple separately" into lmp-dev