Merge commit 'd4e21df96109c26a00116103567af22ff1e8f8a6' * commit 'd4e21df96109c26a00116103567af22ff1e8f8a6': Two changes toward vCard composer.
Merge commit 'd4e21df96109c26a00116103567af22ff1e8f8a6' * commit 'd4e21df96109c26a00116103567af22ff1e8f8a6': Two changes toward vCard composer.