Merge "Initialize PendingIntentController before ActivityTaskManagerService"