Merge "Revert "PBAP server, send favorite contacts"" into qt-qpr1-dev