Merge "Add a null check in case the display is missing." into pi-dev