Merge "Revert the fullscreen flag check removal for layout with cutout"