Remove build warning by removing nil layout