Merge "Correct annotation of ActivityOptions.SourceInfo.SourceType"