Merge "Set the hover state to the same as focus state in RippleDrawable." into nyc-dev