Merge "Clean up obsolete pending timeout after restoring package metadata" into mnc-dev