Merge "Improve UI for PIN2/PUK2 authentication on FDN setting"