Merge "mmc: queue: amend buffer swap for non-blocking transfer"