Fix saving issue when a custom layout is not configured for application branding

Fix saving issue when a custom layout is not configured for application branding #3294