Merge "Add setPackage() to the intent to improve safety" into main