Merge "Fix issue #4902856: Don't let apps register non-explicit PendingIntents"