Merge "Remove click listener from PIN views" into mnc-dev