Merge "Fix the PIN2 input screen remains while deleting FDN" am: ed85c7d201 am: 4f36cbfa3a am: d6ace8a203 am: e794052511 am: edf1342506

Change-Id: I5ce404042acfd27caee3d2eba42814a16fa080f5