Merge "Null check before access display cutout" into main