Merge "Fix the touch area of the edit box is not large enough in Fingerprint unlock page" into main