Merge "Fix bug with sending intents to correct user for device admin."