Merge "Fixed NPE when passing intent to permissioncontroller"