Merge "Added check for preference click"