Merge "Fix await package state timeout fail" into sc-dev