LPS-43042 Fix regression
LPS-42900 Adding removed code in LPS-32158, this code is necessary to check if the display views is null
LPS-42900 SF
LPS-42945
LPS-43090