Merge "Allow killApplicationWithAppId() on secondary users" into mnc-dev