Merge "Fix NPE crash in PermissionController" into sc-dev