Merge "Remove contacts affinity from contact permission descriptions" into qt-qpr1-dev