Merge "Refactor PinStorage#storePin to avoid dead lock when unlock PIN."