Merge "Introducing PendingIntentController (17/n)"