Merge "Fix the PIN2 input screen remains while deleting FDN" am: ed85c7d201

Change-Id: Iaa64369e14cb8b85175eb92e9903f4db57214ca1