Merge "Revert "Adding a support to click disabled prefernces.""