Merge "Fix bug 6563184: API compatibility issue with quick contact" into jb-dev