Merge "Add null check when logging quick switch" into sc-v2-dev