Merge "Synthesize app PendingIntents rather than wrap them" into sc-dev