Merge "Require a more specific intent" into pi-dev