Merge "Wait for target package MessageQueue empty before continuing"