Merge "Add null check for DisplayInfo of DEFAULT_DISPLAY" into main