CLSN-1980 pincode screen rewrite