Merge "Fix the PIN2 input screen remains while deleting FDN"