Merge "Null check for logicaldisplay" into sc-dev