Merge "Add non_system_app_set"