Confluence OnDemand specific layouts have no effect

With the new header, the OnDemand specific Layout Themes are the same as the standard layouts. For example, OnDemand Documentation is the same as Documentation.

However they are still in the layout selector, and selecting these only affects the layout of the Administration Console. It will also still warns that the user will lose access to the old tabs.