Merge "Fix  when enrolling SFPS Fingerprint the Japanese sentence is cut off when pressing the power button." into main