Merge "app_queue: Crash when transferring"