Merge "Add null check for intent in AppPermissionPreferenceController" into rvc-dev