Merge "When forwarding intents, ignoring the package set in the intent." into lmp-dev