Handle priority the same way as when create_record

If not it assumes that priority is a part of the record which is now a part of
the record.data

Change-Id: I6c7921b88ac31b0c8f2ffa615e6b1237bcb0b4bc
Closes-Bug: #1398587
Merge "Handle priority the same way as when create_record"