Merge "Use empty intent instead of null when creating stub TaskKey" into sc-v2-dev