Merge "Add null check for app labels" into sc-dev