Merge "Revert ripple background fast-enter behavior to M style"