Merge "Fix when turn off "Ask for PIN before unpinning" we don't check the result of ChooseLockSettings" into main