Merge "Add  FP auth feature when screen off(1/2)" into main