Merge "Revert "Refactor PinStorage#storePin to avoid dead lock when unl...""