Merge "Add onClick check for lint"