Merge "FDN PIN2 keyboard bug fixed"