Merge "Fix ripple being shown on non-selactable prefs" into nyc-dev