Merge "Call finish() in QC if contact doesn't exist" into lmp-mr1-dev