Merge "Consider Intent.setPackage() for "leaving"."