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

Change-Id: I3048c3878be9ff92a1755cf4e4183bb42ac42e61