[App Layout] Obsolete settings are not shown when App Layout flag is enabled