Merge "DisplayModeService: check for null before accessing display mode" into sc-dev