Merge "Fix issue #6234928: android.app.IntentReceiverLeaked:" into jb-dev