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

Change-Id: Ie26ace20f7812a0cfd6483dd4ebffa45808651e8